resolve merge conflicts of e57ae0e247ac02900f205e7dc1959fde7fa22c3f to master-layoutlib-native

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I180ed00fd7c14c1f184b949ad546fa801dd1e91f