Merge "otafault: Remove the use of LOCAL_WHOLE_STATIC_LIBRARIES." am: 50f5a54a1e
am: 8277230a98

Change-Id: Iff51b6e020288a56a4e9705b9511a646a8eb999c