Merge "libandroidfw: add FALLTHROUGH_INTENDED to silence warnings"