Merge "libandroidfw: Revert null check in ApplyStyle"