Merge "frameworks/wilhelm: Set LOCAL_SDK_VERSION where possible." am: 21d96761d2 am: a04d528e27
am: 9ad877bd5d

Change-Id: Ic665eee6d52a94e7a04f6fd1456744a79b2b2a1c