Revert^2 "sunfish: update SHIPPING_API_LEVEL and VINTF target" 229a73d35b95258d1412d6f8773a7f4175a322f6 Bug: 157446224 Change-Id: I396e9ef2041c3cbd0dd6fa38304dea14982b8165